From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 8 Nov 2025 13:36:04 +0000 (+0100)
Subject: libcxxabi-fix-link-builtins
X-Git-Tag: archive/raspbian/1%18.1.8-20+rpi1~1^2~62
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7860ab5f2eac11a4a151d795312bd4aebc331bb7;p=llvm-toolchain-18.git

libcxxabi-fix-link-builtins

if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library
flags, otherwise add libgcc following how libunwind does the same

Gbp-Pq: Topic libcxx
Gbp-Pq: Name libcxxabi-fix-link-builtins.diff
---

diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt
index f4722c3b35..9cecb73f03 100644
--- a/libcxxabi/src/CMakeLists.txt
+++ b/libcxxabi/src/CMakeLists.txt
@@ -75,7 +75,9 @@ if (NOT APPLE) # On Apple platforms, we always use -nostdlib++ so we don't need
   add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
 endif()
 
-if (NOT LIBCXXABI_USE_COMPILER_RT)
+if (LIBCXXABI_USE_COMPILER_RT)
+  add_library_flags("${LIBCXXABI_BUILTINS_LIBRARY}")
+else()
   add_library_flags_if(LIBCXXABI_HAS_GCC_LIB gcc)
 endif()
 if (NOT LIBCXXABI_USE_LLVM_UNWINDER)